Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 3 Sep 2010 03:34:33 +0000 (03:34 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 3 Sep 2010 03:34:33 +0000 (03:34 +0000)

Trivial merge